# Conflicts:
#	.github/workflows/build.yml
#	requirements.txt

We don't like that and prefer to retain flexibility.

# Conflicts:
#	README.md
#	mrmat_python_api_flask/__init__.py
#	requirements.txt

So we can test with both SQLite and Postgres

# Conflicts:
#	.github/workflows/build.yml
#	.gitignore
#	.idea/mrmat-python-api-flask.iml
#	.idea/runConfigurations/build.xml
#	.idea/runConfigurations/docker__harkonnen_.xml
#	.idea/runConfigurations/mrmat_python_api_flask__prod_.xml
#	ci/__init__.py
#	migrations/versions/d11062fbec93_owners_and_resources.py
#	mrmat_python_api_flask/__init__.py
#	mrmat_python_api_flask/apis/greeting/v3/api.py
#	mrmat_python_api_flask/apis/resource/v1/api.py
#	requirements.txt

* Ignoring /.coverage

* Cosmetic change

* Cosmetic change

* Interim

* Changed from FLASK_CONFIG to APP_CONFIG

* Added new run configurations for migration mgmt

* Adjusted local datasources

* Regenerated migration

* Log when overriding configuration

* Adjusted generated accounts so they don't clash

* Fixed local docker configuration

* Added IDEA pylint configuration

* Removed unnecesssary f-string

* Adjusted path to local configuration

* Logs config overrides by cui

* Interim

* Different schema rendering

For some strange reason, we must dump the schema differently here

* Updated the databases

* Sanitised run configurations

* Transfer

* Fixed some pylint complaints

* Fixed pylint complaints

* Installing dev requirements first saves some time later

* Removed extraneous logging import

* Updated dependencies

* Temporarily disabling test

* Pipeline debugging

* Re-enabled testing

* Perhaps without PYTHONPATH?

* Fixed the testsuite

* Re-enabled testing

* Caching pip cache too

* Temporarily disabling test

* Should be tilde rather than ${HOME}

* Just trying with pytest

* Need to point to local

* Pipeline debugging

* Must affix itsdangerous to 2.0.1

They dropped the JWS support

* Resanitized the pipeline